Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Fri, 29 May 2015 12:22:31 +0000 (13:22 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 29 May 2015 12:22:31 +0000 (13:22 +0100)
commit47ec25a3c8cdd7a057af0a05e8e00257ef950437
tree1931c8253cb5dcae8d9b89024b9e5a45fce4153b
parent088e9b2796bd1f9ebe4fda800275cc689677b699
parent818e376d3b17845d39735517650224c64c9e0078
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging